iOS Sync 1.18.x Uplift #7371
Merged
iOS Sync 1.18.x Uplift #7371
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Brandon-T
requested review from
bridiver,
kylehickinson,
tmancey,
bsclifton and
a team
Brandon-T
force-pushed
the
ios-sync-1.18.x-uplift
branch
from
c029de7
to
72125f8
Compare
This was referenced Dec 14, 2020
Brandon-T
force-pushed
the
ios-sync-1.18.x-uplift
branch
2 times, most recently
from
5c43fd7
to
b5a7e1d
Compare
Fixes brave/brave-browser#12997 Fix Linting for Android/Linux
Fixes the issue where some users are seeing 5GB worth of files!
Updated patches with `npm run update_patches`
bsclifton
force-pushed
the
ios-sync-1.18.x-uplift
branch
from
b5a7e1d
to
fdf73a5
Compare
Fix gn_check error on iOS
Component //brave/*
ERROR at //brave/browser/sync/brave_profile_sync_service_delegate.cc:13:11: Include not allowed.
^-----------------------------------------------------
It is not in any dependency of
//brave/browser/sync:sync
The include file is in the target(s):
//chrome/browser:browser
which should somehow be reachable.
___________________
ERROR at //brave/browser/sync/brave_profile_sync_service_delegate.cc:14:11: Include not allowed.
^-------------------------------------------------
It is not in any dependency of
//brave/browser/sync:sync
The include file is in the target(s):
//chrome/browser:browser
which should somehow be reachable.
```
inherited from existing file in a target that already had check_includes = false
fix brave/brave-browser#12976
kjozwiak
approved these changes
Jan 4, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_tests,npm run lint,npm run gn_check,npm run tslintgit rebase master(if needed).Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on.
Test Plan: